From e6f1414017442c676594b3eceaa4d355e2a8fae3 Mon Sep 17 00:00:00 2001
From: "kaf24@scramble.cl.cam.ac.uk" <kaf24@scramble.cl.cam.ac.uk>
Date: Tue, 3 Aug 2004 16:46:00 +0000
Subject: [PATCH] bitkeeper revision 1.1132.1.1
 (410fc148tLJQNH7768Degg248R1WlQ)

Add a 'verbose' compile option to Xen that gets us tracing without
stress tests or assertions that come with the 'debug' option.
---
 xen/Rules.mk                 | 5 +++++
 xen/arch/x86/io_apic.c       | 2 +-
 xen/arch/x86/memory.c        | 4 ++--
 xen/common/physdev.c         | 2 +-
 xen/include/asm-x86/shadow.h | 2 +-
 xen/include/xen/config.h     | 2 +-
 6 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/xen/Rules.mk b/xen/Rules.mk
index 6073e113c2..92811bae9c 100644
--- a/xen/Rules.mk
+++ b/xen/Rules.mk
@@ -40,6 +40,11 @@ include $(BASEDIR)/arch/$(TARGET_ARCH)/Rules.mk
 
 ifneq ($(debug),y)
 CFLAGS += -DNDEBUG
+ifeq ($(verbose),y)
+CFLAGS += -DVERBOSE
+endif
+else
+CFLAGS += -DVERBOSE
 endif
 
 ifeq ($(debugger),y)
diff --git a/xen/arch/x86/io_apic.c b/xen/arch/x86/io_apic.c
index 5fe9df180d..8e172ae935 100644
--- a/xen/arch/x86/io_apic.c
+++ b/xen/arch/x86/io_apic.c
@@ -808,7 +808,7 @@ void __init UNEXPECTED_IO_APIC(void)
 
 void __init print_IO_APIC(void)
 {
-#ifndef NDEBUG
+#ifdef VERBOSE
 	int apic, i;
 	struct IO_APIC_reg_00 reg_00;
 	struct IO_APIC_reg_01 reg_01;
diff --git a/xen/arch/x86/memory.c b/xen/arch/x86/memory.c
index f2cd500809..340b3e8323 100644
--- a/xen/arch/x86/memory.c
+++ b/xen/arch/x86/memory.c
@@ -100,7 +100,7 @@
 #include <asm/domain_page.h>
 #include <asm/ldt.h>
 
-#ifndef NDEBUG
+#ifdef VERBOSE
 #define MEM_LOG(_f, _a...)                           \
   printk("DOM%u: (file=memory.c, line=%d) " _f "\n", \
          current->domain , __LINE__ , ## _a )
@@ -1250,7 +1250,7 @@ ptwr_info_t ptwr_info[NR_CPUS] =
       }
     };
 
-#ifndef NDEBUG
+#ifdef VERBOSE
 int ptwr_debug = 0;
 #define PTWR_PRINTK(x) if (ptwr_debug) printk x
 #else
diff --git a/xen/common/physdev.c b/xen/common/physdev.c
index a3852f4850..e76b72b56f 100644
--- a/xen/common/physdev.c
+++ b/xen/common/physdev.c
@@ -38,7 +38,7 @@ extern void pcibios_enable_irq(struct pci_dev *dev);
 #define VERBOSE_INFO(_f, _a...) ((void)0)
 #endif
 
-#ifndef NDEBUG
+#ifdef VERBOSE
 #define INFO(_f, _a...) printk( _f, ## _a )
 #else
 #define INFO(_f, _a...) ((void)0)
diff --git a/xen/include/asm-x86/shadow.h b/xen/include/asm-x86/shadow.h
index 4ef230854f..cbfca412b7 100644
--- a/xen/include/asm-x86/shadow.h
+++ b/xen/include/asm-x86/shadow.h
@@ -60,7 +60,7 @@ struct shadow_status {
 #define shadow_ht_extra_size         128 /*128*/
 #define shadow_ht_buckets            256 /*256*/
 
-#ifndef NDEBUG
+#ifdef VERBOSE
 #define SH_LOG(_f, _a...)                             \
 printk("DOM%u: (file=shadow.c, line=%d) " _f "\n",    \
        current->domain , __LINE__ , ## _a )
diff --git a/xen/include/xen/config.h b/xen/include/xen/config.h
index fb0a7d391f..74d7c3b1b4 100644
--- a/xen/include/xen/config.h
+++ b/xen/include/xen/config.h
@@ -31,7 +31,7 @@
 
 #define capable(_c) 0
 
-#ifndef NDEBUG
+#ifdef VERBOSE
 #define DPRINTK(_f, _a...) printk("(file=%s, line=%d) " _f, \
                            __FILE__ , __LINE__ , ## _a )
 #else
-- 
2.30.2